Merge changes Ie04496dc,Ib2998f03,I6cf53e50,Id6eaaad2 am: b500efc0b0
am: 6aa1e9dba3

Change-Id: I9e6087d1b6f58f92ce1ea5e8837729bbdfe6c308