Bug 888250 - Make sure generated report is not null in BrowserHealthReporter. r=rnewman
Bug 887115 - Make Android packager expect omnijar in root directory. r=glandium
Bug 888248 - java.lang.NullPointerException: at org.mozilla.gecko.health.BrowserHealthRecorder (recordSearch). r=nalexander
Bug 888676 - NPE accessing mHealthRecorder in GeckoApp. r=nalexander
Bug 888665 - Bad stored add-ons cause document generation failure in the presence of good add-ons. r=nalexander
Bug 888692 - Missing trackChanges call in forms.js. r=markh
Bug 885886 - Clarify definitions of FHR init times. r=doc-only
Merge m-c to s-c
Bug 889413 - FormWrapper._finalize is not a function. r=markh
Bug 889669 - Use Python 3 compatible octal syntax; r=ted

And change the permissions to be more standard for a user directory.

DONTBUILD (NPOTB)
Merge birch to m-c
Merge birch and m-c.