Merge "Allow PO to call setSystemSetting." into pi-dev