Bug: 26792072 (cherry-picked from commit 2bf56594) Change-Id: I4e9f4ab0b8ff215c39d854ee041c1acfedcf0b6d