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

Change-Id: I1cd464a95fbcfbb172766412e26207eef34b6dd5