Merge c6c474c4ee331a1c0eb1b54f7f9d515a7a7af21e on remote branch

Change-Id: I80dc93d5afa92ce5621ab42349363e1656accfd7