Actually wrap with 1.1 IServiceManager binder object. am: 65cfcda01b
am: 2337f3958f

Change-Id: I510218ff32d7bea2b66045df809dbf973e4be442