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

Change-Id: I46918a026f547ebd8a001a1e4dba2881cf6dd134