Merge "Settings crash when receiving data state broadcast"
am: 2ed42d009b

Change-Id: Ie0dcb238e132705022408e2f0cacd35597ff86f1