Merge c8d9d5db6b6c60db62bba9d2690fb38dee20bc6c on remote branch

Change-Id: I80dcb07cbe233c174a4ed7870fa7d4f107f27ad8