Merge a3e3e05c20cd0fc1ee1825019d65156d82106bac on remote branch

Change-Id: I996273c97a16fbda008901a2cf9d29f5af818ed8