[automerger skipped] Merge "Address API council review comment about...
[automerger skipped] Merge "Address API council review comment about TetheringRequest" am: 0d8b1cfa am: 5deb1946 -s ours
am skip reason: Change-Id I0158d88e364772f9ac258bd18955edcdad266ad8 with SHA-1 25d64399 is in history
Change-Id: Iee4232c13e9085ccab062bd9b1c6c05de4ca2c0e