Bug: 17262039 (cherry picked from commit ae94e350) Change-Id: I1cfc8dac1f63b9012fa098804135be8847b1daee