This reverts commit dbf703ffa8.
Reason: Will switch to the framework solution.
Change-Id: I86b793e4a428ee9c3aa776b1c2a78faed07145bc
This reverts commit dbf703ffa8.
Reason: Will switch to the framework solution.
Change-Id: I86b793e4a428ee9c3aa776b1c2a78faed07145bc