Merge "Don't verify secondary setting on restore" into oc-dev am: 25329fa14f
am: 50aff0167d

Change-Id: I3b5a5742bd13a3884e2f7b66e2742e2d70102128