(cherry-picked from 101d32ebb80f5f015781b98cb53739e8ad933cb4.) Bug: 6857263 Change-Id: Ie0cd0efa4444eb0ee63a1a91890f4bb48539e7a7
5b7633be
06e515dd