Fix wrong ref element generation. Bug: 17979117
Merge branch 'fix_17979117'