Merge "Correct scope of "disabled?" check viz backup/restore decisions" into oc-dev am: d239223cb0
am: 136f841c5c

Change-Id: Ibaf2939a7873ea017be0c71785ee02be8bcdd5ff