From https://googleplex-android-review.git.corp.google.com/#/c/387811/. Change-Id: I3958a55c72b095c53b054c11c5653ba581881188