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

Change-Id: I16b84e4566bedd4172cdc48d3d158ac1c80b0f4c