This reverts commit 479f361d77. Reason for revert: Restore 16405845-t-codebase-seperate Change-Id: Id7f5e8b7e4470416da0002768c3960e554c0cf6c
479f361d77