Fix: Merge of Android 4.4.3 and 4.4.4

Change-Id: Ib4212c98a18ee52e38e4b4fe89997a3e2a280fe8
Signed-off-by: Chintan Shah <cgintan1998@gmail.com>