Merge cherrypicks of [20271394] into tm-qpr1-release.

Change-Id: I331bc663372b07af495250ed314456f4644535e3
tree: 266847efb6a382aa1322c36192eed140079b6855
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS