Merge "Fix NAN validate interface existence" into rvc-dev am: 8fce7985c0

Change-Id: I530730b65ef7961776b44bc0077f5c4f71d2b5e5