Merge "Fix bug in dynamic BCE. With regression test."
am: 3941c882ea

Change-Id: I6755b5454e20212555b03da803eaa8bc470cd41c