am b220d62b: (-s ours) am ea6bf362: Deep clone settings for system package update DO NOT MERGE

* commit 'b220d62bf3032c5c8b2a36a00cd6e6d6b63c7db5':
  Deep clone settings for system package update DO NOT MERGE