DO NOT MERGE Make nav bar button click listeners overrideable am: 9203e45a01

Change-Id: I7e772521dc196880367a56c35a3f411e522a4440