* stable-2.16: Rewrite OS bean provider to avoid using reflection Change-Id: I46576e75484bf1e5e6c520b2dce8ea3b5c23fc61