Remove superfluous lines wrongfully kept by I5c1a23713 merge resolution. Change-Id: I67b6925ee23a6220f5f77b87fdb862906aaa35bf
Remove superfluous lines wrongfully kept by I5c1a23713 merge resolution. Change-Id: I67b6925ee23a6220f5f77b87fdb862906aaa35bf