Merge 66354e8f61178d789f1eb82b7948326a19daa888 on remote branch

Change-Id: I06b6aa4ddae80a926abea70160d865564667e672