Merge "Fixed a bug where the order of the icons was wrong" into oc-mr1-dev am: 942aaf5ae8
am: 7c548a5712

Change-Id: Ib20dad12716a3472d6cf78f469e793ce18a5093d