Merge "Properly split the fully qualified class name into package and class name." am: b44e9144db am: 8120b25456
am: b08fc6f4bb

Change-Id: Ie39e76839cb218788097887682d067d8c61ee531