Fill in missing intermediate label values automatically Change-Id: I81e6052ee22fea91267d0f428fe008c5cb13b132