Merge "Fix broken javadocs." into oc-mr1-dev
am: b79eb54d36

Change-Id: I283e3914833b01969308afbd2fad1889e0497338