Revert "squash updates from code aurora - cyanogen"

This reverts commit 0e895370f0bebe0c179f0c9d9c3404555a2df5bb

Change-Id: I88ccb289f041c5bb0ae72afeb6f27c92962a49e8