Merge commit '54f5ca4115b776eb5a1e04a4c014acccb916ef9c' * commit '54f5ca4115b776eb5a1e04a4c014acccb916ef9c': Add Java exceptions to catch RS calls with no context or no surface.
Merge commit '54f5ca4115b776eb5a1e04a4c014acccb916ef9c' * commit '54f5ca4115b776eb5a1e04a4c014acccb916ef9c': Add Java exceptions to catch RS calls with no context or no surface.