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

Change-Id: I376197118faadef4175ed97be87ed50b4573e919