am dc25bf18: am 251bb396: am ea05f82a: Merge "Fix obsolete javadoc." into lmp-sprout-dev

* commit 'dc25bf1840abcf05448bc02bddf5074eb983c0fb':