tree 0f6763278789acbf6edc6ecc964dfffde8765673
parent 4d9f7a8bc34a3944e4b3b4922dfe2be47b46da85
parent 1ed95cb0854f146237274f45e62f109b2ef453c5
author Pavel Grafov <pgrafov@google.com> 1529952793 -0700
committer android-build-merger <android-build-merger@google.com> 1529952793 -0700

Restore separate challenge state on error am: f10ae7e731
am: 1ed95cb085

Change-Id: I28a6f5f4a05b64ad5a7cf2cda486e84a9a7503e7