Merge "Add conditional class starting"
am: 89e2aa94b7

Change-Id: I86e3f639f05bf6e625f62095c7d75cf85946bb85