sync some live hack changes, changes to extinfo,
and functions.php that weren't reflected in the package

Change-Id: I06148c4200add3a8f64a90b0c764faacc218c349