[automerger skipped] Merge "DO NOT MERGE Remove OldNitzStateMachine impl" into...
[automerger skipped] Merge "DO NOT MERGE Remove OldNitzStateMachine impl" into qt-qpr1-dev am: adb2dfcd -s ours
am skip reason: Change-Id I81ad0c324dab64913b943a20b3e9e30e344b0c92 with SHA-1 40e8f7af is in history
Change-Id: If430a1c3c9404636eb77e4fda4790ec87b63bbb7