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

Change-Id: Iaae2b97c513d124c29f4fccf1a6668e1a0e28d69