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

Change-Id: I1ede620fad6dfe3debb7156bf882a27402bfb5d9