This reverts commit a3c528f64d. Test: Build Change-Id: Ib50221873e39dee40c5cf8e4b41dcf7aa13f6134
a3c528f64d