Merge 0d42eeced623df86d554abab0f35cf7bdd47b48d on remote branch

Change-Id: I2b5685cb11ae26e78ebd98fff104babbd2eaaa12