Merge changes Ic3c5095c,I87bc3e37,Ifd21e25b am: ca10a6ffd3
am: 17c76f4a68

Change-Id: I56295b0c2bd03a1bc455f32aa7a379b8d981d895