Merge "Remove duplicate test expectation entry." am: 359db87557
am: edc6362225

Change-Id: Iba0cd64d416d00ba064efdc02a9d5a053587ad15