Merge changes from topic "m" into oreo-cts-dev
am: f40fcd461a

Change-Id: I6e655eb47f304d5d7eccbd20a68dd57a4b25cc95
tree: 6678dc9f5bb443088e8c2046cd627cef5bc101b2
  1. tests/