Merge changes Ibed11e8a,Ic6bf0c4b into nyc-mr1-dev

* changes:
  Merge \"docs: Added Android N (API level 24) to the \"API levels\" table\" into nyc-dev am: ffe63a4ad8
  docs: Added Android N (API level 24) to the \"API levels\" table am: 563c4f1adb