[automerger skipped] Merge "A new NitzStateMachine implementation and tests"...
[automerger skipped] Merge "A new NitzStateMachine implementation and tests" am: 9c6951cd am: d6de40f0
am: 5f5bbec0 -s ours
am skip reason: change_id I02a96b2c7ea646b548bc874bdadcbffa0caa9ab8 with SHA1 e5214bd3 is in history
Change-Id: I941c7f98d6b27f6a38bc9b55b0b17c3f2125ea7b