Merge "Remove obsolete reference to ServiceManagerNative." am: f961b9632f
am: 045d5884fe

Change-Id: I434212fe15be9b6ed1abde556718c08eb552709a