base

am "Few changes to make API check happy [DO NOT MERGE]"

merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed