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

Change-Id: Id9d95f7c61d86f3f9f38ab5dc290a9ebd9bb892a