Merge "Jarjar duplicate classes" into rvc-dev am: ffc478d673 am: ea088d8de2 am: d1eb3ab959 am: 87acf30310

Change-Id: I14028fc2b279681bdef5be8ffccec92ec89f3993