Merge changes Iff879def,I79c72346 am: 89562f11c8 am: cfd87fe514
am: 068cdf84ed

Change-Id: I42c17b01af756934edfe92d0ad01be27ba92f0ba