Reconcile with ics-mr1-release

Change-Id: I8c28be97a60bc619a3d853c08d5c1dcbec1c7e20
tree: c1ea5e7fbc0237ac615cd4473ae6ec9dfc739144
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/