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

* commit 'f0d538f08da7c45e545e51e93373afe38cbd518f':
  Block developer settings during SUW