Bug: 17177284 (cherry picked from commit 9598b8c415) Change-Id: I2c9631ee1cd77f8cf95ec0216a35b605c8786454
9598b8c415