This reverts commit a9072327. Reason for revert: Re-enable fixed tests. Bug: 189031816 Change-Id: Ibb95fe64a0fa6e9cf05c48371c12195e0697bf73