Merge 3108f607ffbbd081b9c2f56dea53d2a271bb58ac on remote branch

Change-Id: I35b75cf2683c222bccb2607a8d13df6dc5224e8e