Merge "Fix spelling of "HARDWARE"" am: 9fbe481727
am: 281664abf5

Change-Id: Ia44897a95b7ac0d0b394a1605ff9cdb6a586e236