This reverts commit 8b6968328d. Bug: 147407617 Change-Id: I6208344a26069239e47665710dd2fea93136ab95
8b6968328d