Merge "Add an extra set of test cases for libpropertyinfoparser" am: 69ee1c9418 am: 91a3b6e207
am: 321881e373

Change-Id: I025f030d89580ab611ed0274de7e407c24b72f07