Merge "Jarjar duplicate classes" into rvc-dev am: ffc478d673

Change-Id: I02cae7c379d2f71820dc058ffdd68d918432efa7