Adding label fallback

Change-Id: I1efc10ce62c7dd9fc924685d958e22d73ce45c22