am a40f2842: am 78fe885f: Merge "Fix addtional proximity correction" into jb-mr1-dev

* commit 'a40f2842cf9ed085703518ed16ddd9e9f66560da':
  Fix addtional proximity correction