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

Change-Id: Icea2de548c1e8a5cd11efa96db446dd13985f5e1