android-4.4.4_r2

Change-Id: I6e41d488f033d036675741f40a436614a05be8a6