Bug: 16875245 (cherry picked from commit 1291e9bc) Change-Id: Idd0f7ac677568a53569308a67f1ad613584949a5