Add missing JavaDoc and remove unused imports
am: 8148220d5f

Change-Id: Ia51e1ff8c397adc9539802785511835ecf2a00fa