Preemptive minimal import

Just to handle conflicts from internal

Test: make
Merged-In: I6fbc22272ba95b44aa09ff08f9d9a7adbb9ae8be
Change-Id: Ibe3ca5c654057b60fa9f045e6fc1f39d14463b44
1 file changed