[automerger skipped] For validation off case, do NOT switch data until new...
[automerger skipped] For validation off case, do NOT switch data until new conn is up. am: 2be0d236 am: e8666888 am: 60a14bde -s ours
am skip reason: Change-Id I555f4d8d900fdd081738f3db8b02fb2728a3d88c with SHA-1 8f59df17 is in history
Change-Id: I4f9d4472ee91f40c79cb9625e40ba6ef0dc23dc7