Merge "Don\'t crash the system when detecting a transient wrong state am: f970410afe am: 35ad9d867e" into nyc-mr1-dev-plus-aosp
am: 87a4877c35
* commit '87a4877c35dae54c0e3508717281e4c64cfd9e69':
Change-Id: If7a3eb9a99ab4b1fd489016b5b05e7ba1570af23
This commit is contained in: