Reduce line count by two

Change-Id: Ib0ee2bb5b202966d3d07c754656c92006149af9c
Merge "Reduce line count by two"