Merge "[AWARE] Pass through full structure for end NDP command" into oc-dr1-dev
am: 61f5c145fb

Change-Id: Ia985a1de1db3e026890c83588f0f52d6a3f0ce24