Reconcile with ics-mr1-release

Change-Id: I1693539643fe35d4ffc893bf9b5444fd416756f2
tree: b982c85b251ab968a90f8ce8054b46617eb964a1
  1. res/
  2. src/