Merge "Merge "Move constants to MODULE_LIB" am: af1162983f am: fe225d32a0 am: 42e932bc2e" into sc-dev