Reconcile with ics-mr1-release

Change-Id: I7af0b572fb36c3c93761232c46d9adf74da8aacd
tree: f85b7451bae57fdcd1acb436979b3b15b5bab1f8
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/