am 436be3f8: am 1162372c: Use the feature list for the SDK.

Merge commit '436be3f862065e67087fbc95fd75b03e0496cea3'

* commit '436be3f862065e67087fbc95fd75b03e0496cea3':
  Use the feature list for the SDK.