Merge "Collected Patches from Ittiam" into pi-dev
am: bebb9d1183

Change-Id: I64c405bab2a52822d27976cbca7d13bf135ea15f