Merge cb052619fcc1875debcb66b9dbee349d500891d4 on remote branch

Change-Id: I6e4810849045110db34302239cdee2a81063298c