Merge "Add ability to disable conference event package handling from command line." am: b19d68f23c am: 7be590e79b am: 58998d23d2
am: 336571337a

Change-Id: I7ff2bc17e5836416e0eaa4a15176cc38c230bbfb