This reverts commit bb5bcaaaed bug:8377625 Change-Id: I9663a4646f7581c86b2303aec2655cbf3742fd80
bb5bcaaaed