Reconcile with ics-mr1-release

Change-Id: Icedf366b2ea11de0f8b0f6107a549ccc2f97a58e
tree: 5de4d74ebe8fe984aac122c34a360012f89eb361
  1. res/
  2. src/