Merge 6a55808639d150cec0db165eb7eecbe1990c2df7 on remote branch

Change-Id: I073935ceebbea8445c2e33fec8ec9bbfcbd1fa50