Merge 6714c9ee98ccf3ef6c22681830d01a45bc6afa04 on remote branch

Change-Id: I539e2cd9d77528926dcd84def6eefd0588edbe51