am 7e2c0a15: Merge "Support querying active record sources" into jb-mr1-dev

* commit '7e2c0a15bb8086460070811a152029726479a297':
  Support querying active record sources