Merge changes from topic "am-51b46eaec273425e8f512ddae1b8fd68"

* changes:
  [automerger skipped] Merge "DO NOT MERGE[Wear] CP wear setting keys in a batch." into udc-dev am: ae3c8b79 am: 8fd46811 -s ours
  [automerger skipped] DO NOT MERGE[Wear] CP wear setting keys in a batch. am: e4457a19 am: d4c64823 -s ours