This reverts fd901f73 and 5e21bf93 Bug: 7237764 Bug: 6693087 Change-Id: I7cc9657e4df219481eb33de803081a01b13ee0f2