Merge "Remove binder dependency in init." am: 4280165ae0
am: 538b50d9d5

Change-Id: I570719645f98326c76e1943573686e044b48723b