Reconcile with ics-mr1-release

Change-Id: Iaaf97ddd8d3786e661679d822ccdb7241303db51
tree: 045ca732bdc262bcdcdb9105bd7fabb98c6a1cac
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/