This reverts commit dc5509b3. Reason for revert: Contains copywrite from Ittiam Bug: 68320413 Change-Id: I6059593304d0ed7e88439d1f5940679206566629