Per API council request. Bug: 127282563 Test: atest RollbackTest Change-Id: I72e979ce3978c72a0783b44a044ad536b35ee09d