Merge "[AWARE] Fix maxNdpSessions documentation" into oc-mr1-dev
am: 5920714752

Change-Id: I891efa8137b3a69b320d65c34832d4e64530cb20