[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

Change-Id: I02ee73805adf76dacd4654de29d070f2ed01dabe