Merge commit 'f79266f306f7696eb637b11554bb9c8e6cb97ad0' of sso://googleplex-android/platform/system/libsysprop into HEAD Change-Id: Ib2e335823bffa9099919d4a2420d5a570662527f