Address feedback on the API Fixes: 155926142 Test: CTS Change-Id: I69e17faf4d09ab686fdd97975bc7f069597b87b3