Editors: Minor branch consolidation

Change-Id: Ida5ed6c5a7fb623c64573eb538771c4376c3c578
Reviewed-by: Orgad Shaneh <orgads@gmail.com>