revert some to 4.4.2, no updates

Change-Id: Ie8c5da1987215aaaafa605ebbce59db84a12096c