Merge \"AppErrors: Fix bad flags printing in dropbox crash reports\" into nyc-mr1-dev
am: b4addbc282

Change-Id: If9ac62f69406845f3a204393149510c9fcfa53dc