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

* commit '645c606353b44c46216fdb5d8b9d8d5269f1c191':
  BasicContactables: Fix lines >100 cols