This reverts fd901f735c and 5e21bf934b Bug: 7237764 Bug: 6693087 Change-Id: I7cc9657e4df219481eb33de803081a01b13ee0f2
fd901f735c
5e21bf934b