Merge changes from topics "DocumentSource", "ID_API" into pi-dev am: 3c4e33a4fe
am: 41a28e7fe6

Change-Id: I99619af2463c8afd6c97725417994cdae0c8bbc6