Merge 571783a2a14ea85c38edadc9a9bd8663eab33281 on remote branch

Change-Id: I5d0c22b7fe23ccdfb21508f2f6ae2fcfcf1616bb