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

Change-Id: Ia9b1e5bed85cb654505f9afafb81bf42f99ea7c1