Merge "Remove NO_RETURN"
am: 3fc0363268

Change-Id: I7ccdc2273436e2592093b6cd0486ef94ce1e4cf3