am bc0e9df2: Merge "Fix javadoc for preference lib" into mnc-dev

* commit 'bc0e9df22bd6db2cc6236d19919c221849df0e91':
  Fix javadoc for preference lib