squash updates from code aurora - cyanogen

Change-Id: Id3a3c0f13e8334d417348d174de4492dc5bb6661