Merge changes I4968d5aa,Ieb34d79a,Idc073536 am: c2f9ae35e6
am: 4379639606

Change-Id: I1d29954997012b2ac435dab96486175a40cd65a8