Merge stage-aosp-master into pi-dev-plus-aosp
am: 17c07503ec

Change-Id: I1fdf525277c5229791807404f3c74ab51d3ab841
tree: 399d4d1667cb4459fd936a6a1b80d2213e81dcef
  1. service-t/
  2. tests/