Merge "Remove unnecessary stuff from oam directory of A1 controller"