Trying to fix S2W and added BLN thanks to zarbos
e72722a7ff1446a085037804e6f275f206a5373e

Change-Id: I76363ea13c9fcd168888d04ccfee39da98afa255
Signed-off-by: Hieu Phan <aznrice2k4@gmail.com>
r4

Change-Id: I3929176e18cecea3106836d90b93b73d27303e3d
Signed-off-by: Hieu Phan <aznrice2k4@gmail.com>