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

Change-Id: I628fcc4305b6e5d2ca94154295cc47f206a13f82