Merge changes from topic "offload_cherrypick"
am: b09cf3fbf1

Change-Id: Icb4332b34bc8b940a2c30beab143f7136e0178de