Merge b5fb1347d2e7d6b1b5716a77ce8f8f631ccd6ef6 on remote branch

Change-Id: Ia43a8dd65aab0d9959469edc0474f5410bb7547e