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

Change-Id: If87fafcb7cc703fcd92c84fc966535948977083b