Merge cherrypicks of [16738003, 16738004] into sc-d2-release.

Change-Id: I773e62fc3c3e9176862d4a230a966f307f3a72a0
tree: 0fce9b6d45f4987066d3a188817d4e460990e854
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS