Merge "Fix a NPE where developer options page crash sometimes." into pi-dev
am: d940a680a5

Change-Id: Ida116e1bedb08795077991c391426fce5d820bca