Merge cherrypicks of [16737147, 16298079] into sc-v2-release.

Change-Id: Ibfee9b09eda7084e403fac64008668770b6b4922
tree: 11747358e9b25fd092f62378e782f173274fdbe8
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS