c936d73adb
b/13418320 Cherrypicked from 7e435a011dd519f76a8ec1a8ed99a22bee5c3e26 https://googleplex-android-review.git.corp.google.com/#/c/433316/ Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c