Merge 1bb0858ffeebefc7c617899b65497f58c615e077 on remote branch

Change-Id: I79fc52517650328159ec72a8f1f1bcd3ac8912b1