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

Change-Id: I99c7b6536ed83411c8947bca29978573dd29e7c2
tree: efb056a39003796dbe1412d28465da62f3ca7808
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS