Merge "Icon assets for magnification" into oc-dev am: 4d386d5ce7
am: 549a439b53

Change-Id: I9cc4e50292a04becf92548ab5be4c54d19736a54