Merge 8fb0a256568abf903bf1e3b3e1a712b717e3ff84 on remote branch

Change-Id: I74211ade361b43881a642d009e1af19b4aca2bbc