Revert back to (mostly) KK behavior, fix a problem where we were collecting some data in an inconsistent state. Change-Id: Ida3ca3fb734a9d7d61a90fd5044152e927c59e02
Revert back to (mostly) KK behavior, fix a problem where we were collecting some data in an inconsistent state. Change-Id: Ida3ca3fb734a9d7d61a90fd5044152e927c59e02