Bug: 26623636 (cherry-picked from commit c98d6a4c) Change-Id: I6378d5780def3a26d340f213973a4094e97426f5