Merge "Fix crash in developer settings when backup is not available" into oc-mr1-dev am: 6f72b57428
am: f76056c576

Change-Id: Ibd4c1b1ddcd83e77a9c2a14d7aa6c92f5088e6c4