Merge "CDD: Relax CDD section 7.2.3 visibility requirement for nav functions" into nougat-dev