Merge 3370a954ca892d40c3d5b6948f728df6dfe05eca on remote branch

Change-Id: I9c0ba6076874598e3cdeac34c49e2338cd479c75