Merge changes from topic "offload_cherrypick" am: b09cf3fbf1 am: df2a880775
am: 64f6edc7fa  -s ours

Change-Id: I604ec95dec7466831a29526217308bb869326229