We're hitting b/29043547. bug:28769520 This reverts commit 279ee76a. Change-Id: Ic971e3db1048668bb48d47b1efc2977a4fff533c