Bug: 223736548 Test: make This reverts commit edfc5e86bd. Change-Id: Ie693f24b76d00469ad71a36989e481023946c3bb
edfc5e86bd