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

Change-Id: I1ba14d9729dba38dd6f67768ea2c83972a853847