Merge cherrypicks of [16717418] into sc-v2-release.

Change-Id: Ibf6092b3504ee4e773ce7b1954bba2f877ba39ac
tree: 3ce06ead8dd383560efc4cdd788a2701f3f16f8c
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS