Merge "Bp/n/sFoo -> Bp/n/sHwFoo" am: cb5989d239 am: aef68e76b4 am: 62626ed9f6
am: 5b0222c33d

Change-Id: Iab25a7d913a9398b1b1c1ec4fec8759b9fc80778