Some references were lost in the rewrite of content. We should point to the appropriate new content in those references. Change-Id: Idcbccadfc104a4883149ea6c73ca5b50bac09841