Merge "Allow developer options in retail mode" into pi-dev
am: 265981f394

Change-Id: Ie99484aa859ec5a0032e5d5269bd5401531e5287