am 4735a4fd: am 18daa159: Merge "Document the behavior of props affecting adb root."

* commit '4735a4fd67ea64b4fc5da225235f7d977db2a778':
  Document the behavior of props affecting adb root.