Merge "Fixing build breakage (current.xml)"