Merge cherrypicks of ['googleplex-android-review.googlesource.com/23486820'] into sparse-10750268-L94100000962880297.
SPARSE_CHANGE: I4cf7a16ffda683a25e1cd6d1cce53940975740e6

Change-Id: I7534ade83bc29e344978c973031cad3484aee0a3
tree: db03fdef0b8efe4b83fd31f0c37310dad455d1c4
  1. .prebuilt_info/
  2. current/