Merge changes from topic 'llndk_rename' into oc-dev
am: ce4c78224d

Change-Id: I9a8345c7387b960aedc039031fa724ebdc05b0d8