Merge "Replace import with fully qualified javadoc." am: 31a7838fb1 am: 1d5eed4cb0

Change-Id: I0f1e36b55517c9d875c5351f39940ed4742f3acd