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

Change-Id: Ia5996be3b2e6a09ec5ba8be8c7328dd4f6d6f17b