Also revert all dependent changes: This reverts commit8e18668d14. This reverts commit69b4587bfb. This reverts commita9c9a4baf2. This reverts commit2c0042b666. This reverts commitf6c8206735. This reverts commit24855c0917. Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8