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

Change-Id: I9106c03e0030fb0ae6b93ff2cb261108408c7478