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

Change-Id: I40c56566ec27821da7ecc15b54b20014fbc90b95