Merge b2bd7eec308afdb291983999bcd8f3f54835b671 on remote branch

Change-Id: Ib8a288e6492419e491475d3ceb99a16e84a985ba