am 3ece6d8c: (-s ours) am 23a7bc9c: am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]

* commit '3ece6d8c8830191586210d98169fbabc802d4e62':