Follow our own bn/common

Change-Id: Iae500db0e0bed39b30cdd0c62b6df06f9a5931db