am 73a96904: am 44b6afc6: am 3afa402b: am 846e9bb2: Merge "Add test for MediaScanner misbehavior" into jb-dev

* commit '73a96904f650de30a7d40afa3e5ea6ddac4ccdb6':
  Add test for MediaScanner misbehavior