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

Change-Id: Ibc38ca00ee46de82623d2997f66d7c2c3dfa97db