[automerger skipped] Merge "Fix the wrong number of icons in shelf for RTL"...
[automerger skipped] Merge "Fix the wrong number of icons in shelf for RTL" into pi-dev am: 8861d33d
am: 93e9b456 -s ours
Change-Id: I199cb60025b19e29739dcc716754dac717269d35