Merge "Revert "Change testapps to reflect API fixes"" am: 30ff5a4dd1 am: cfe56d8f52
am: be4e04f6be

Change-Id: I9e6333d1dd68a35245c8cf160edd60a808edfb2e