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

Change-Id: I4861e339831436761ee6f845aec1773f4ef65b76