Merge changes Icc2810f5,Ib0ad635e am: 1435ace8da
am: 79f115fddd

Change-Id: I5e780d3240c32cef602a061feb0b888e714862de