This reverts commit 7c8e76f87d. Bug: 28810934 Change-Id: I3a61bb0c2364909480045dd40adba6445d6afabd
7c8e76f87d