Squashed commit of updates from CodeAurora. From CM10.1