Merge 890844eb3727ad56b3da292941443f32d306ace9 on remote branch

Change-Id: If4eb9d5d44eac4d93742c6b5f159f2421a7d7e76