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