Merge cfd9df32172f299db16a2490791f256c568ddbf0 on remote branch

Change-Id: Iadcfaec459b28d8f53b3aeb96547e11a3a8f5786