Closes-Bug: #2105867 Change-Id: I57e494c6e01c45a5e102c575eaa6101a2b440868 (cherry picked from commit 8b246c2316)
8b246c2316