get all upstream fixes from 4.1

Change-Id: I17e7a5f45042298faa79bf2e7539e92afd02008f