Merge "Remove leftover of change ff6900d8f991aac0b67b625f8a1d4d0461b4"