Merge "SupportLeanbackDemo: Fix generatev4.py" into nyc-dev