Merge "Fixed java doc error" am: 5831d309fa
am: 717e4eb21a

Change-Id: I083379d7e68bb8d073c9b071f9377c7d29328025