In response to API Feedback. Test: Builds Bug: 126700125 Bug: 126360307 Change-Id: I17a14fd0d1b527ee38f68935cddee73fb4d10195