This reverts commit c3973b401e. Bug: 171539436 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I050b6767cbb0a958ebf3cc7e3475e552deee4048
c3973b401e