Merge 67d5536b4aa9fb5614a9c686d483a74eaae61d01 on remote branch

Change-Id: I0ddd6b005d5dcc84c2f36816da9f424bc9b96e77