Merge 23dce4670086b69e493fda4e291c5890e54a63a5 on remote branch

Change-Id: Idb09defff5782526978d9660cad9618e92539ab2