This reverts commit 648bd115. Bug: 123870990 Test: no changes Change-Id: I02204bfccb4a305f1d4b841fe79a2bdc1aa1182d