Squash commit 4.4.3_r1.1. Do Not Merge!

Change-Id: I65e4ceb3c18537121b7a8026161ef402410c4b96