Merge "Fix crash when recreating SecuritySubSettings" into nyc-dev
am: aee8d8c

* commit 'aee8d8c7e127cf35c0d579c3cbfc6204d6b3229f':
  Fix crash when recreating SecuritySubSettings

Change-Id: I677d0025a9dfbb6afe7ad340d1a6e57daab5ab98