Merge 228ddebc2b8b1e24c6af5b5d2da11be7deb871e4 on remote branch

Change-Id: I1779f2c39f74213ac223b396042459973f1e1cc7