merged from goog/mirror-m-wireless-internal-release 3ec7681 Update API. Change-Id: Id4a08ee8e55cd4f5e8182a38d4855be80d452090