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

Change-Id: Ibe019d041e86ec2342fb66159399e2eda0c51fbb