Tests still faill. Bug: 25635944 Bug: 19467889 This reverts commit fbeeb47f. Change-Id: I8f49dc6e8d3eb5f0de10636ef2685b7a2e08f297