Merge "Fix build caused by automerger and missing imports in master."