new s4 master

Change-Id: Ic99ea5150da54188b955a7194c9fd4f59ecc7a41