Merge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19 am: 537a7880 am: d241ae7b Change-Id: I6ad58d21f8ea2678f7ac954cf34cf55ef2f5b46f