Fixed SchemaTracker behaviour in choice nodes.

Change-Id: Ia1ed56a8a263b1d0397ad0c54f9b6e5775939d89
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Merge "Fixed SchemaTracker behaviour in choice nodes."