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

Change-Id: Ia37f47663ce7932c9d294512b7af011849e27c97