Bug 13170859 (cherry-picked from commit 740888f62e) Change-Id: I7b5e206697fcbec146cac6cd83fca5c583a8cbd7
740888f62e