Merge "Tidy up Android change markers"