Handle compact slug case where parent slug is not present
SRE page, step 1 [story:41685995]
Merge remote-tracking branch 'google/next' into google-master
Merge remote-tracking branch 'google/master'