Merge changes from topic "l1" into lollipop-mr1-cts-dev
am: ba3927948d

Change-Id: I71f9c4d293a0913b3274b070a6ed50c4731ab1b1
tree: 146373b019a4908790b019644ebfdd0db18b0aff
  1. tests/