Merge "Allow developer options in retail mode" into pi-dev am: 0f4545ac64
am: a9f6576c8b

Change-Id: I1d214eab76c8b19b2955b7844be31735d79ba384