Merge "Update test to use match external interface change"
am: 0b6386b6d6

Change-Id: I395398d713caa67d46c66bb8022b746efca1b9c5