Removing inherit on analytics1003-1006

Change-Id: Ib781d50f0dab52e0d3cd68f0c5c1d4c146e2d6cc
Merge "Removing inherit on analytics1003-1006" into production