Moving java package def into a class for analytics role

Change-Id: I6c2acf2012c9aa445329614ae039cbb409797895
Merge "Moving java package def into a class for analytics role" into production