Merge cherrypicks of [4902692, 4902722, 4902585, 4902586, 4902656, 4902657] into pi-release Change-Id: I10869af0f9cdd981a540182ad2500e78a269bdee