Merge stage-aosp-master to aosp-master - DO NOT MERGE

Change-Id: Ic18c84dc2c382560a8b44e24ecda315c1a2797cd
tree: 8a1862eb14551f587e4ec965816b9f9fab5c39af
  1. tests/