Merge "Remove MODULE_LICENSE_APACHE2 from LivePicker"