Merge "Restored 'maxConnsTime' and 'maxConns' in data profile" am: bcb0c1b49a am: 777d7abef3
am: aa7c36789d

Change-Id: I98aa9a0d06af910fe3032351b2d96e79b8e9c0a1