am 6615f69e: am 13f4dd75: am bc0e9df2: Merge "Fix javadoc for preference lib" into mnc-dev

* commit '6615f69e3265398c78b0b489345313f95e3b6180':
  Fix javadoc for preference lib