Reconcile with ics-mr1-release

Change-Id: Id6ecd416cb70e55c28ff885caae29d9000dc9133
tree: 53bbbb11e9cbd52c7694382a72c9e6cddfbe9806
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/