am 7e11af8f: Reconcile with ics-mr1-release

* commit '7e11af8f5813972dd64032e70068e10f87771234':
tree: ef46f52aa0563e1300e2ee439cda2c936e09286f
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/