Merge commit '7c847c4e' into fix-merge-conflict

* commit '7c847c4e':
  Update board-info.txt for new radio.I9250XXLA2

Change-Id: I400a7ccc29c3fc5960dd77ddc0abda34dadeb2aa