Merge 0ab30bcb36c27adb95f3ac049d383e3ed680d286 on remote branch

Change-Id: Ic9553058303931eafd129ba5eb04f65cab538199