Reconcile with ics-mr1-release

Change-Id: Id5562da0ab0f961c8263b5a101a2ed3e32bd9b58
tree: 963c1548c3f0b882e8067cbc2f9df9c2c2f01168
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/