Merge "Merge "Move to some properties users to libbase properties" am: 2b20612e77 am: 9e4bfdb0b6 am: 506f89a250 am: 0ca5b37250"