[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

Change-Id: Ie281f82d3a3f944a7567646b1c7dfef40069a119