am e7841bf4: am 3e3b4dfe: am b1aa73f6: am eb02f412: Merge "Use unique entries only. Do not merge." into jb-dev * commit 'e7841bf4': Use unique entries only. Do not merge.