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

Change-Id: I8adad0105c095d548c2dbf98089f874156dbc4b6