Merge "Fix build breakage on -user build"