Merge "Add an extra set of test cases for libpropertyinfoparser"
am: 69ee1c9418

Change-Id: Id77137f45fb2206095c16510b51da835e4de32a4