Merge 7966982ab2dfa21775c6f29d2fad051962784d49 on remote branch

Change-Id: I8b0717073d20f212ebcf9a3818b1a1ff7bf6bf32