Fix logical conflicts from the transclusion merge.

Change-Id: Ic9d708cdba74c908d14839def5050c8825134c56
Merge "Fix logical conflicts from the transclusion merge."