will have all these fixes merged together when the building is done

Change-Id: Icab1d1496884179f80d3e3de6becfb864d9f7018