Merge cherrypicks of ['googleplex-android-review.googlesource.com/20910823'] into tm-qpr2-release.

Change-Id: Ife493b04fa1700cb4da00b8743825e28f70fae2b
tree: 21ef6ad5de5b0d90a2564aa402d9cddfb55e3ac3
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS