Merge "Prevent Historical AppOps from returning empty data."