Added support for Emotional Jenkins

Change-Id: Icaac9cc07b64384b3d65234bf9c603ef55f0b104
Merge "Added support for Emotional Jenkins"