f43820d856
This revert is not related to the build namespace. Need revert. This reverts commit 9803b4594018667429126c8cf6d7913e2ed24370. Change-Id: Ic1759e02287e0272b1f5901c94f204cf7b4844aa