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

Change-Id: I44fc295a1500962062773aa9ac31c3ab347a627f