Merge "Add conditional class starting" am: 89e2aa94b7 am: 6ba7cee010
am: a9915b3f44

Change-Id: Iff00f82ad5df381071fae411d43a2c6430335997