4.2-ization

Change-Id: I3e076d14c4a9c90d6b58798ac6d4dc04936d3103