am 3dc6d4d3: am d07b8f2c: Merge "Additional logging to track down RSRuntimeException issues." into klp-dev

* commit '3dc6d4d356fc76a22690c0b999c13dfd8fb2e1c9':
  Additional logging to track down RSRuntimeException issues.