Merge 70102d4a17712763bf2305109e24c09877b63bd4 on remote branch

Change-Id: I7d86260fe35e5ffa7213be834018c64c169f28b1