Merge "Update Dexter test data (part 3)" am: 3ede9ec3c7 am: be5d35de44
am: 40cc73ecb5

Change-Id: I37b0d226df7ad1027176ea9dcb99c36b9a7f80fc