Merge "Unit test for bug 13234532." into lmp-mr1-dev