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

Change-Id: I14f46ba9b1f3340155f64162faa8566532900290