Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: I08d90f09595783ecc235a95c3ab1b02f1bf1c21b
tree: e686227d93d11d6a54e0f670900c4210bb632045
  1. tests/