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

Change-Id: I10da440bcd3160bbef588aa34bea68f030f10cc3
tree: 0d5b86e47b0e392dd53df20076168792b95573a3
  1. tests/