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

Change-Id: I674c7da780afba0974e4ffe3f53d31bca665fdf0