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

Change-Id: Ib9fa0a30a03b74cf7ba495354b0a6ba156235bea