Merge "Fixes an issue where the guts could disappear" into oc-mr1-dev
am: 6b3501ab91

Change-Id: I3011c9437aac2405c35c93df746a7a865256ab48