Bug: 10312777 Change-Id: I9f3a886d96fc07f3280f1781ea917a4ea7f1d3c7 (cherry picked from commit 4c65c8aa)