bug: 26689841 Change-Id: Ie1c04adb7cd5cc35ece233878e219f4a29f94348 (cherry picked from commit 5731615b)