Reconcile with ics-mr1-release

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