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

Change-Id: I60546fbaee3a9d1cdf5389d0f57cb0d4417d6205