Change-Id: I1a243caa3a01837ff989d21926478f20d70372ae Fixes: 120132045 Test: python apilint_test.py (cherry picked from commit 373df11b)