Merge commit 'd4225765e217618ef09f12d1a3531dc4b9bada6a' of sso://googleplex-android/platform/external/parameter-framework into HEAD
Change-Id: Ia6602908e9009c56f092fce95e0c4719cae784eb