Merge fb22c26fe7f65ad82d5e91d8fdb8c0ebd0db9b27 on remote branch

Change-Id: I5973b7b2b7af41b8a8966d5360969c2e6d457ada