Bug: 16667988 (cherry picked from commit 40a52174) Change-Id: I7550fa47b76e643323aa3e2a53529e393c829e47