Merge "Fixed java doc error"
am: 5831d309fa

Change-Id: I16e6228110512926af593fff2151cec0e99c9433