Merge "init: finer grained permissions for ctl. properties"
am: 05063a8715

Change-Id: I94c7b6f4460d1006bd08365ff77c61d8c86ad43a