Keep the bind intent and the config intent separate. Change-Id: I645a7e697d49d46a4870b7b3a252b3214ee85412