Reconcile with ics-mr1-release

Change-Id: I1693539643fe35d4ffc893bf9b5444fd416756f2
tree: afacdd79405d5adcfac3c51c8d54b8d1cc4f3a1c
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/