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

Change-Id: I18eab63b48ba92dacabfa1724aaffa7a8980e6cf