This commit also enables LISP mapping and messsage providers. Change-Id: I06ff330ba6144bff472c2ede49d9e477aa38880b