[automerger skipped] Merge "Move safety & regulatory manual closer to legal settings" into pi-dev am: f81ec88024
am: d735f982d2  -s ours

Change-Id: Ida1b0fc4ccd3a903752151c0a9227283150cccc6