Merge 4814452eebac0b1991fb80f634536d7a6130ef5f on remote branch

Change-Id: I18d5689caf78f43c4002ef87740929a9901ef44d