Merge "Merge "Moved data retry handler from broadcast to message." am: 19cd7568c6" into stage-aosp-master
am: 6904af3684  -s ours

Change-Id: I5ae05ad2f4e2b4ca749b730f0ef98e70f272980c