Merge c0f05e593425c23ca12c888dde5dc8de0aac78e8 on remote branch

Change-Id: I50162f4b1566a5dcb7ad7c825470c2d44b251f69