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

Change-Id: Ic2f23ea145af0aef96671aefb574fafa7aad2b87