Merge 8670237e952d014a45621c4369010bbcf7d4615b on remote branch

Change-Id: I8a12991b1bd8eeb00a1307490d635480da7161af