Merge "Remove GENERIC_FAILURE and INVALID_ARGUMENT for Api documentation"
am: 2d0b636b29

Change-Id: I342068f8bbcf6a97c322bcf0049fed83b519bcda