This helps us to prevent circular imports in follow-up code. Change-Id: I94f85f2257d4702376f4ba5eb995a544a2e53fd3