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

Change-Id: I4d8370e8755b9e917477cd4434b1acc27345a62d