Merge 1836cbd8f511fb3a02b937e095eed0b8dd2466c2 on remote branch

Change-Id: I62c70a8039d05183940da01f363e32750b2d28bf