Merge "Fix label loading on default home setting" into nyc-dev am: cbf2ccbe1b
am: a69387df1d
* commit 'a69387df1d594823becfa129a72960264c487c31':
Change-Id: I28a37469abea63baf11909d048921a058eb8f333
This commit is contained in: