Merge "Create a host side checker for property info file correctness"
am: db976aa526

Change-Id: I07b009c4214f7b104a2c90ebb58149c49bbc5235