resolved conflicts for merge of 6c78e499 to master
resolved conflicts for merge of 6c78e499 to master

Change-Id: If2a1d6d8b7be71f450310ffa3c0cc9b35b563a02

rfdy/volley,RandoApp/volley,google/volley,google/volley,RandoApp/volley