Use Name & Desc on LineItem if available

Change-Id: I46fd6909513864b568304e2566b192b2f563bc39
Merge remote-tracking branch 'upstream/master'