[ros-diffs] [fireball] 42377: - Merge 42376 (along with committing a merge history leftover from a previous merge).