This reverts commit 4e38daf3. Change-Id: I1bc6f375d393bc42746a949f3f0861fd1b4adabc Bug: 23270724 (cherry picked from commit 4d79511e2fb367f17410cea03feabda41c14a1f5)