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

Change-Id: I5ff49a416a90ad4630ec96749cb7567152ee91ff