Moving common function to the right place.

Change-Id: I18cc985ae023aa727f49c2815e5009d43e2acb4b
8 files changed