[lra] branch merged with trunk

[Vladimir Makarov]

The branch was merged with trunk @ r196091.

Successfully bootstrapped on x86-64.

Committed as rev. 196099.