Bug 25567963 This reverts commit 53de36f9c4. Change-Id: I4faaa0b4c50d75e208f37b99bc1d6e2f0fff8127
53de36f9c4