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

Change-Id: I3e4a40b3cf940bf6688d4e8c38d6e2c68f011dc4