Merge "Fix build caused by 168380"