Merge b28ec0262f6938771387901d2079b48c8a6bc4c1 on remote branch

Change-Id: I450b0cfef198eef38443a798f0effd8d65b1ef51