Test: manual Bug: 289228540 Flag: N/A Change-Id: Ie78cd39d5636d8737b80a809fb22328de574f0c0
Bug: 126587956 Change-Id: I13ef4298a8133ff5773eef8658a04094d5d154da (cherry picked from commit 476a511ca5)
476a511ca5