2nd Half of Youtube Fix

Change-Id: I16316d63d4c6c7283f68ac27a63e20f54d6165d0