Merge "Make sure that namespace links are ordered" am: 964d6bddf1
am: 0312c694eb

Change-Id: I1968e1eb7e88f44f40be64c1b37f90659ca30ddf