Merge "Move safety & regulatory manual closer to legal settings" into pi-dev
am: f81ec88024

Change-Id: I7156cd60aed8ee1a8d439c6e1504df0b578a0ff3