Merge remote-tracking branch 'slim/lp5.0-caf' into lp5.0-caf

Conflicts:
	res/values/slim_strings.xml

Change-Id: I9aa17b94582922ac3d6a326ba4ed5bd0dcec1499