Merge "Unbundle for not access MetricsEvent and Environment.STANDARD_DIRECTORIES"