Split NST handler events away from CS internals. am: a1ef1bec2a am: 5194390267

Original change: undetermined

Change-Id: I3b83f64addf51998763eac70b5fd92cebdcbceca