I20190515-0205
This reverts commit 6f96965af7bdf596d62e9aa41b20ba98576696af. This destroys the fix for bug 544924 and causes a build path error in my workspace. Change-Id: I494403a77934ba5dd8d994c5fbef19bdee83ec58
This reverts commit 6f96965af7bdf596d62e9aa41b20ba98576696af. This destroys the fix for bug 544924 and causes a build path error in my workspace. Change-Id: I494403a77934ba5dd8d994c5fbef19bdee83ec58