Code streamlining.

Change-Id: I00155566d6fd4cb8043ad38201a58181b995c52f
1 file changed