Merge "Update to reference templates to include resources to fix navigation...

Merge "Update to reference templates to include resources to fix navigation highlighting issues. b/28560594 b/28586131 am: 307d36d9 am: aa012638 am: 69ef9866 am: 5461c2f0 am: 69d4aa2d" into nyc-mr1-dev-plus-aosp
am: d9214c32

* commit 'd9214c32':

Change-Id: I98019aea718270782563b239a8b27d88a7e71d0b