Merge c826bb4c660285433f505bfb6797246b54d60eb3 on remote branch

Change-Id: Iac741fe7dbbf2525303ef91f66a83d71b683f9d8