Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 am: 2b29501039 am: f0d538f08d
am: ebc5086d15

* commit 'ebc5086d15bc1be602dfcd31925000e8c6184f16':
  Block developer settings during SUW