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

Change-Id: Ie9f5fd2909773c9c066ab763f19e17d34f6f1e03