Export more symbols for init
am: 5340684e43

Change-Id: I795197cd2daef1a2dd5f6241dda8c0956e3d04ab