Merge \\\\"Plug another hole in BatchUpdateExceptionTest.\\\\" am: c2a2ad1b am: 8bbc8196 am: 061cac90 am: 505cc751 Change-Id: I6fe38ae16f666f631aeb55c83e42babb9b70be31