Changes based on api council review BUG: 18005911 Change-Id: I23bd207ce70f7fa201d6d964c1700cfc44cb009b