Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev
am: 293664a1fb

Change-Id: I4fb988a1a18189c4dd34d2154b42be227d346c82
tree: 59be354e010f9cf95aaa3d0cbbf9b1ff92fcacd6
  1. tests/