Merge "Guard against crashes from data saver listeners" into nyc-dev
am: 557c716

* commit '557c716a3aa3b146c4a2fa4a68860377d435b233':
  Guard against crashes from data saver listeners

Change-Id: I116c326ab8a26d8cbb0de12eba1e90c415df92ab