Merge "Remove recursive ALWAYS_INLINE"