[automerger skipped] Merge "Update javadocs for API review" am: bbf2a83826 am: 166b068da5 am: 93f094ba51 -s ours
am skip reason: Change-Id I80c3b4425f317d5b4e9c685878c866742b706b85 with SHA-1 6236729164 is in history

Change-Id: I5078afbde3357d28efe47b442736e8117c0d4329