Merge 66354e8f61178d789f1eb82b7948326a19daa888 on remote branch

Change-Id: I0f39fa7b68db82f106a43fe890acf14537f48d10