Bug 10749552 (cherry picked from commit 68c50ca4) Change-Id: Ic1636b019bdbbb621d082f8d2b546d4ba12c34e9