RomStats move

Change-Id: I6899290b3cf936fc641205911992ca880ffd4cc1
Merge "RomStats move" into kk