am c73e813f: am e83a81e1: Merge "BasicContactables: Fix lines >100 cols" into jb-mr2-dev

* commit 'c73e813faea8dc800bb40cb68de5b15bf96baa79':
  BasicContactables: Fix lines >100 cols