Merge 243933b9b7593c8b27eb009f253efee4e3104b4a on remote branch

Change-Id: I8a2d9a67e222b658c569b0e5032ee1bf70c49458