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

Change-Id: I199657bc2e2582cd2228045ae208d96bbc951485