Merge branch android 4.4.3_r1.1

Change-Id: I3fae72fead1f1a4f757e43fdb514153130b330bc