Merge "Merge \"Build both filename views before deleting.\" into nyc-mr1-dev am: fff6a114" into nyc-mr1-dev-plus-aosp