Merge "Merge "Move to some properties users to libbase properties" am: 2b20612e am: 9e4bfdb0 am: 506f89a2 am: 0ca5b372"