Fix a bug from merging frame parallel branch into master.

The merge did not merge the fix for issue #850.

Change-Id: I0dc1377dbfcb9497fb01a13d4f78ac65bff5eb33
1 file changed