Merge 852eeb016b77cf5ee38fa84dd16e08b6bdf7395c on remote branch

Change-Id: Ief1769a37a898f6c33d42b2fdf840f72ac0a804b