Merge "[AWARE] Defer requests received while terminating an NDP" into oc-mr1-dev
am: 74a518bca1

Change-Id: I2728016546c2ea5a622a8778a4bb4eac2ea01d7c