Merge changes Ic8d22016,I3e15296e,Ie275e22c am: 321a60f156 am: ebce8ca94e
am: 5fb739fa01

Change-Id: I48a3e69fec7a5eca350e1d8af9c1af9b98f9158a