Merge "Remove CHECK that GetThis() must always work."
am: 0b6b0cb6dc

Change-Id: Ib2639bdbfdf197c6558935eeb4a2545cc7255463