Android 4.4 Release 0.7
resolved conflicts for merge of 8607272a to klp-dev

Change-Id: Ic9b996432bfcd228ae8a45f75bc9c564a3a66a31