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

Change-Id: I6a2cc30754413eccb59ba775c14863852a89fefc