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

Change-Id: I58b49eab495b6b949368f86f5dd32bfc507d4141