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

Change-Id: I9c85385771a46c3040c35c4fc6565a9ec0b60466