Reclass fixes for new lab models

Change-Id: If53b0255df4a5aeb37255e82baed893419e2dd6b
6 files changed