It's causing b/68995913 This reverts commit 18b2a13a. Change-Id: I386df4896f45b13b47e3dbf9ab842448c5e11306