Reconcile with ics-mr1-release

Change-Id: Icedf366b2ea11de0f8b0f6107a549ccc2f97a58e
tree: c3a5fa6f2b8022c9d6ca5a29f1b0044159259ea2
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/