A workaround has been implemented. bug:35417197 This reverts commit aa4ee8d2. Change-Id: Ib8b6c0bd279fb0052f49b1eb4565024e4c520f27