Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev