Merge "Icon must be placed near the text string on the input screen" am: 35f15c2453 am: ba6607a097
am: 0e5ab36431

Change-Id: Ib536708bac56bde8eee782854e51e57db995f3ed