Merge f907d6a50e91ae7963a4f37d78c485620e974ba7 on remote branch

Change-Id: I8931d11d5cd8f41f976e1bede98f4481e4dea469