Merge \"Catch RejectedExecutionException when loading app data.\" into nyc-mr1-dev
am: 0a2a3a6ac1

Change-Id: Ib75835b3e2f3780f91e5c53d73db992254985733