This reverts commit 2fe9369ce8b6a766bd32c183305fe56c0f6b37ea. Change-Id: Ia4474afb4e17b87f7599ff052ab2c1582b09c4c2 Signed-off-by: Siddhartha Agrawal <agrawals@codeaurora.org>