Refinements, updated submodules, getting ready to merge with M2 in AndroidTracker repo