This reverts commit 2d1d7875aa. Closes-Bug: #1735259 Change-Id: I37501c4c983c87e3a38841272eb176ebbe626a65
2d1d7875aa