Merge "Prevent  overflow in LocationRequest.setExpireIn()" into jb-mr1-dev