Merge branch 'stable-3.7' into stable-3.8

* stable-3.7:
  Annotate the config's Example 6 as obsolete for SR

Change-Id: I23ebb0c66ce64dbb3171a9a995362db9b32b43a9