Merge changes I84cafc84,Idc388c56 into eclair-mr2

* changes:
  Merge commit 'goog/eclair-mr2' into play-with-monkey
  Package blacklist/whitelist file support for Monkey.