Merge 3f908cd5513e2a255c5baac0b2e61fda1c6af434 on remote branch

Change-Id: I1ec7492e60c01567b1bac733b7acc883fc7628bd