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

Change-Id: I96f26ec23db34ff642a11cbcdef888fa9e5072bf