Merge "Don\'t crash the system when detecting a transient wrong state am:...
Merge "Don\'t crash the system when detecting a transient wrong state am: f970410a am: 35ad9d86" into nyc-mr1-dev-plus-aosp
am: 87a4877c
* commit '87a4877c':
Change-Id: If7a3eb9a99ab4b1fd489016b5b05e7ba1570af23