Reconcile with ics-factoryrom-release

Change-Id: I445a06a1c4486a76a9278c2ab57415cd902f8927
tree: 7a9722f42b4577d1936824b83e276019d11e3e0c
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/