am 07a3b570: Merge "Fix b/5403449." into ics-mr0

* commit '07a3b57049665faf56f2c65b3310143a4ef464e7':
  Fix b/5403449.
tree: 97dd79d283784bf9b3f9a3214e75fa79b2ec36d0
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/