Track build locally and some fixes

Change-Id: I24b533fd474015d2697460d234e3e7c97e21e894