Merge a263a05e3459f85a0d703112557c4ba99a522a24 on remote branch

Change-Id: I1aa5b8af2e4049b1a6242b4f27496b640e21127e