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

Change-Id: I2cdd9f862ea61821503eac0e6f0c7c6cd418e57b
tree: 97e93e9d72cf6a02cdf2caecc9d35191e75c7c27
  1. .prebuilt_info/
  2. current/