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

Change-Id: Ic0fc4059894126248e00a46d8cefe13efa8a1f6f