Merge commit '9d9a3533e0108d23ac3d0019db117c651345d8a6' from
oc-mr1-dev-plus-aosp-without-master into stage-aosp-master

Change-Id: I9e57d46009e6b168a357cb83930c619321a7f545
Merged-In: I31cce33ea785dd82b1b40d6a98b7ba99c4dcf41b
tree: f15467486a147d79ac5cf24e30da7de03882cf1b
  1. QuickSettings/
  2. Settings/
  3. OWNERS
  4. PREUPLOAD.cfg