This reverts commit b04c57ba980793c43b79c9d889e94e3cd164e8ad.
Change-Id: Ia669ea1f2efbae46290e4ea5f860cdd3671277b4
Bug: 3389139 Change-Id: Ia23748568619bd48d13260e443e2fcd333cde3fc