Use generics, suppress warnings where appropriate, remove unused imports, etc. Reviewed-by: lancea, chegar
Reviewed-by: mchung, alanb