Merge \\\\"Use __ with attribute __noreturn__ to avoid colliding with noreturn.\\\\" am: e0dfd2a00e am: a1d9edfbf3 am: 95bafa7cdd
am: 9f240487dd

Change-Id: Ib99c7016d4e7e052f5c10b68ea7ba439d8a79217