Merge 8cd6715812049e9f7672aec8312cfe1448822177 on remote branch

Change-Id: I15ae147f0be2d56adf75b14bf5131357f4a75596