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

Change-Id: I3e44fdd82fb5ec8a1beffa759df82a67556ea16a