am 858c8fe7: am d118394d: Merge "Properly handle cases of multiple inotify events" into jb-mr2-dev

* commit '858c8fe7f98036a345a26dd710fbdad82357d201':
  Properly handle cases of multiple inotify events