This will allow it to be used in the config API. Change-Id: Ia0116cd158a14c8a15bee59a38b1f4892a84c297