Merge tag 'android-4.4.4_r1' into HEAD

Change-Id: Ie5b825ec177ab06b188ecfc16aff8d41f9fd9751