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

Change-Id: Ie2a77b1b61488fede9761c02f74208a5a5305a6a