Bug: 27775991 Change-Id: Ie4eba211e876ec0643ce6ecf6a110f3cb5e0f57e (cherry picked from commit 20ed24fc)