Merge "Fix issue with unresolved IDs in adaptive icons" into oc-dev am: 7844a34308
am: 90a29fe305

Change-Id: Id86baf67c37eba17974f8f15447984e576b75428