Merge "Fix typo cpu6 -> cpu7"
am: a903d36523

Change-Id: I2e4e0bbaa5d9f0dc44eb48b1d8f07848b2ad8961