Bug: 15142926 (cherry picked from commit a15a81b2) Change-Id: I3c099a2ba15faeed8d40472566ada197d46a72e5