4.3 stuff in 4.1

Change-Id: I006a8d065741d5a3b35e76475e7e29abfc6505d0