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

Change-Id: I21449a09f15f15cea228d2cfe5e9af05c1d387d2