Merge changes Iec369a50,I3f9f8d56,I78959464,I72ea858e am: 6ad16cda19
am: 7b45da1006

Change-Id: I5969bd70c30e1f4f4e7fbff337a4a1e16ed03176