cherry-pick from oc-dev: docs: Note regarding device IDs, Build.java am: d6ebb55c62
am: fcd96e847f

Change-Id: I51b08b72f22f30a1e825a2192bc0f09f7d8f92f7