[automerger skipped] Merge "DO NOT MERGE: Fix mobile in/out activity indicator icons are not shown correctly" am: 460b05ebee  -s ours am: 05f12d026d  -s ours am: eb087e6ef1  -s ours
am: 37a2fe46ce  -s ours

Change-Id: I532d70643669d67c577ec8a43599c7a73dade0d7