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

Change-Id: I1be94b33cb153d50df480ffed28413fc97ea3082