Merge "Bp/n/sFoo -> Bp/n/sHwFoo"
am: cb5989d239

Change-Id: I546a6835259d38c0343665c1f48798b19bf009a5