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

Change-Id: If16fa69469208147531c3144d77dbe1995b87a17
tree: bbbd8153799dda3c832b4ce686b219891b451fd9
  1. .prebuilt_info/
  2. 1/
  3. 2/
  4. 3/
  5. current/
  6. OWNERS