Bug: 16463406 (cherry picked from commit 7da37cca) Change-Id: I22a26d4ec4e3048ddcfd668eee4fccd8b2b3b727