[automerger skipped] Merge "init: finer grained permissions for ctl. properties" am: 05063a8715
am: a2d48a633f  -s ours

Change-Id: Ibb51ce9cc8fcb9ad04b5583cc17cddc0c8581d6f