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

Change-Id: I515feb8e50207d72776e66d481da8243f8bfc793