Merge "Mask out macRandomizationSetting when feature is unsupported" into qt-r1-dev
am: 37e47254a8

Change-Id: I8caee0e8064f3ab9bf0b35c9f94509d03e4752e3
tree: b1db60d5b7ca4d29b0c71d6170d7ab02ca34d830
  1. service/
  2. PREUPLOAD.cfg