[automerger skipped] Revert "[DO NOT MERGE] Revert submission 9950791-pick-precise-dataconn" am: dcbe98371e -s ours
am skip reason: subject contains skip directive

Change-Id: Ic31141e4876a7a5b600109f99a2e83747fc2eac4