Bug 879956 - Don't print email address to logcat when syncing. r=rnewman
Bug 880171 - Part 1: return null if unable to retrieve storage in EnvironmentBuilder. r=nalexander
Bug 880171 - Part 2: handle failure to retrieve storage from EnvironmentBuilder. r=nalexander
Bug 880549 - Include add-on blocklist state in payload. r=mfinkle
Merge m-c to s-c.