[automerger skipped] Merge "Connect inquiry results back to legacy layer" am:...
[automerger skipped] Merge "Connect inquiry results back to legacy layer" am: 12923eab am: 570c6ef6 am: 96e5d452
am: 0c32fef5 -s ours
am skip reason: change_id I949b1d90ead14cf15baa2a74db979ec76151650a with SHA1 6c07ed6e is in history
Change-Id: I3bffe85eacc388f755ac84ac43983acfe723377a