Add extends declaration back and and missing import

Change-Id: I3db9d772e018d937aa5e5c125421c5a47366e3a4
Signed-off-by: Evan Anderson <evan1124@gmail.com>