Merge changes Ia43f8811,I7de4f672 am: 3ef04b8e3c am: cbaed4e7ba
am: 40b8170b09

Change-Id: I11fcb4a1fbf5ccb46c41469529b3d5dfbbbdd394