more stuff for commons

Change-Id: I9ca7b98399716fa29b6354da25e13daa87008643