Add missing use statement and annotations

Change-Id: Id1719564214c5a4df12fc96f24ea841a9cccd15c
Merge "Add missing use statement and annotations"