Merge "Fix crash on expanding settings conditions." into oc-dr1-dev am: 77a34f69c6
am: 5436dacf2c  -s ours

Change-Id: I6e0b5aa0cef66d109d445ea8cfd38a1f1bbb1b30