Merge changes from topic "offload_cherrypick" am: b09cf3fbf1
am: df2a880775

Change-Id: I3db23fef19fc66a4eee158fb3367f45078b30872