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

Change-Id: Ie987f8cce6e99f5da5adccaae7188fea9b8ab3a6