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

Change-Id: I090ecaa896e2dcc58a500b5a92eb6ed0be974385