Merge "Fix b/5403449." into ics-mr0
tree: ac4c2ae65f7747bde48dd08611e031691a239dd8
  1. res/
  2. src/