Make system metdata for extension better

Change-Id: Ie752e5c90a3106f38ca31b7d9730f39717268276
minor cleanup

Change-Id: If55558bdd59e8537746f96049b4385c9cfe5efa1