Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 9fb791c62d

Change-Id: I7b9ae6590c67f89b023417e511fa823b79ad53b1