[automerger skipped] Merge "Replace import with fully qualified javadoc." am: 31a7838fb1 am: 1d5eed4cb0 am: 8d0af4a6a9 -s ours
am skip reason: Change-Id I198d84a755b5e270a19b41328f6a6e152112c40a with SHA-1 1fec28066f is in history

Change-Id: I51d7388df9919471e4a3347b755e9c7992844b37