Merge "Don't set value when developer options disabled" am: 692f5368d0 am: 5ef8843845
am: 4f7895f08b

Change-Id: I688e3dfee47ead666e93d8b5a42ad88a49259d65