Merge 0486915867c78027022b1478fd8c974a83e7b0bb on remote branch

Change-Id: I1df43b30b219febc43545b0e9037774589d22c10