Merge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19be
am: 38568aff22

Change-Id: I913abeb2222f1fb4af814ea9741608671e30fa30