am 71a8a437: am d6150a11: am cee87829: am 996b5190: am 35ed15aa: (-s ours) am 65c21107: am 327a5640: (-s ours) am 9ab46af7: DO NOT MERGE Cherry picked from https://googleplex-android-review.googlesource.com/322614

* commit '71a8a4373d209c4674ae8d4b4fe2003dc9fe9de1':
  DO NOT MERGE Cherry picked from https://googleplex-android-review.googlesource.com/322614