Merge "Fix for goat detection code" into rvc-dev am: 7588f0d7a0 am: 4606688141

Change-Id: Iaea55a2c07100eab390c162dba6343061fadf2da