Move references out of experimental

Bug: 39599
Change-Id: I1551ddaa3d52c4827c7dcac2a02e31859769890a