Reconcile with ics-mr1-release

Change-Id: I0eb3a8338e095504809785f4f9ff15c0e8fc7329
tree: 0bc3b686c428d9c5b22fbb7c445ecae51c5d2f66
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/