Merge "Don't Ignore new extras in ConnectionRequest" am: 23a0c7ab64 am: 06aa51657b
am: 837874b017

Change-Id: I055b8a12477893cbeb684afef0927907367774a2