Merge cherrypicks of [3373038, 3372799] into pi-release

Change-Id: I7868a88c73095b37de6ef4e83aa41aa247091e01