6a03efc111
This reverts commit bcbfceb716f7259a9a81e5750b60dc6ddc8f0a63. Related-Bug: #1463478 Change-Id: I37055c4a85ad747de9b177fb0d12f48edc2d63f5