Merge "init: Ignore "ro." restrictions when reading prop files" am: 86f38d56b8 am: 0cb6e46c18
am: e2869a0bee

Change-Id: I127f2c503f8c5d581d684f161b6bc6d240918bbc