am 93df689e: am c5cc6611: (-s ours) am 3bcf6c5d: am 8e4f1d30: Merge "Pass in throwable when calling Log.error" into studio-1.4-dev automerge: 13a9226 automerge: e2e100d

* commit '93df689e9d94e2da3a3ab4bd6e21d4ae8fd3d348':