Merge "libplatformconfig: Fix usage of global variable"