Merge "Return not supported if no necessary socket option"
am: 69ae441fa1

Change-Id: I592d08040459e544a53861b4e8a0ee49a50f225b