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

Change-Id: I768f338174227e07e55e3159a844d09c7be983cd