Add missing 'use' statements

Change-Id: Iace6eede29d65b2ed20e9f5672e083cc81e25f9c
Merge "Add missing 'use' statements"