bug: 26689841 Change-Id: I463543c67cc525583d1fd6f7031a0d38f543d8a2 (cherry picked from commit 64aebdc02b)
64aebdc02b