Merge changes I4decffcc,I283e88b1 am: c651fcc98c
am: 96529c6f22

Change-Id: I862ae82674dac663c52afed072a0afe0f9f9a5c7