This reverts commit 03dfa50996. Change-Id: I1f7188b35ad657f3d9721bab3bbdec697d3c1ae3 Bug: 36101902 Fixes: 38352100
03dfa50996