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

Change-Id: I98dc5babe5a88bb31ddbfe5dba0f927293f3caff