Merge "Temporarily whitelisting system domains writing vendor props"
am: 3125af3c16

Change-Id: Iee20d8a616db2cd91a4529aa2e5a9c252c48457f