Merge "Fix instructions to run test" am: 05e3225cd3 am: 7d87997a62
am: 15b9f46d34

Change-Id: Ia088592b0cc3c788175f21bf3b4171f5ecd76062