Reconcile with jb-dev - do not merge

Change-Id: I8aad743a4282d3941d177fa5c30e718730bfc16d
tree: 6147e21bec40dcaa34f50049894eef76b77ab596
  1. v13/
  2. v4/
  3. v7/
  4. volley/