Merge "Restore 'Reference' code." into qt-dev-plus-aosp