Merge "Fix build break due to 44089019"