This reverts commit 3d0726b4d8 Change-Id: Ie1ce5d09cc0b799ef0799f30eedc95f0ca5d3fad DrNo: jerrryw
3d0726b4d8