Merge 83c56ae36131f5d586b018b1b787ce95e4d38830 on remote branch

Change-Id: Id55ce0acc995d89b61b04e2c8d63957e2d09bf77