Merge "report correct build target class" am: 974f750661
am: 3a08a9c079

Change-Id: I987aacec689e1aefc650163aa7fce309253e386c