Address API conucil feedback

Test: compiles

bug:131683068

Change-Id: I02afd0cc392e4fadd60de0d9802748452262543b
3 files changed