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

Change-Id: I6f554ae743b713a8592bad0ccc6a5f0646b8cb43