Merge 66b4fb546f1b38150dd2be8e4ae8eb419c1a8e4e on remote branch

Change-Id: Ie04e0a24af98bd25a29e0df391edb2717bc160e2