Merge "Make final adjustments to empty state text size." into rvc-dev am: 2e22c0e88c am: 5097a28d9e

Change-Id: I3f1d42c974d168d2e412bad168be5f9f74d78c34