Merge 909bb2bd1715806230b48b9caa4ff6b730ed5258 on remote branch

Change-Id: I159e4eb8fe03b121193f661a3271f25d96d5aba1