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: ec88030f" into nyc-mr1-dev-plus-aosp
am: 10c8f4c4
* commit '10c8f4c4':
Change-Id: If153bd8ae0ccb9373d7fb79b9bbcb2ca3efef9df