Squash commit of 4.4.3r1.1, DO NOT MERGE AS IS!

Change-Id: I5dfa09bee70d509bf7cfc6e02891948c5c9cde81