am 6b340ad0: am 7c945d24: Merge "Make error a warning for now"

* commit '6b340ad06c90ad80894bce720075e05f31b8f4cb':
  Make error a warning for now