am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev
automerge: e036ce2

* commit 'e036ce2e7044efcc8be71241a7e0a1523955f20c':
  Update javadoc for DEFAULT_FEATURES deprecation.