Merge "Fix FrameMetricsObserver crash" into nyc-mr1-dev am: 0d8f164cde am: 744a887cb0
am: a1dee422fd

Change-Id: I7066ffde505484a6c9745f47561be79a61ba7627