This reverts commit e47ed07310. Bug: 171770067 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I6ea54389dffe53bd903ade11314a77668d10a014
e47ed07310