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

Change-Id: I54ee7ce313210ff47c62ad417c96da40a03cbb29