Merge "Squashed commit of installd changes" into cm-10.2