Bug 1019436 - NFC: Assertion failed: (rfst != NUMBER_OF_NFC_RFSTS),  function nfc_create_rf_discovery_ntf. r=dlee, a=test-only
Bug 1019668 - Part 1: Don't add errorMsg if the status property is undefined. r=allstars.chh, a=bajaj
Bug 1019668 - Part 2: Re-enable missing marionette tests (error_messages, checkP2PRegistartion). r=allstars.chh, a=bajaj
Bug 1020034. r=bz, a=2.0+