Fix some javadocs [0]
Bringing MapViewManager up to date. [1340]
Merge remote-tracking branch 'upstream/master'