Merge "Change offline profile to store type_idx of classes."
am: 137b07593a

Change-Id: I54ddfa87ea79389c2c3c2ae424859b765d09c879