Merge "Make final adjustments to empty state text size." into rvc-dev am: 2e22c0e88c am: 0447945132 am: 401dfef855

Change-Id: Id57f1c468a730adc84a6f3f7162f4c9bbbeea1a1