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

Change-Id: Ibd988a3301cb683dc9254974933b6dba354e6a2f