[automerger skipped] Merge "libperfmgr: Add a new type of node to manage property" am: 45fdf1f909 am: ca15368e4b
am: f8d9078de0  -s ours

Change-Id: I787a670aaac63bfd84e4ea8201cb16eb4568484e