Merge "Restore 'Reference' code." into qt-dev-plus-aosp am: 610d1c4787
am: b3d2df45bd

Change-Id: I00c051a1a40531611a8dffb002ac10b3b23388f4