Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev am: 7fc94d02ca
am: 52d573a044

Change-Id: I3b68aaa872313c0a9cf0506c7601648b85e32276
tree: 75a10edf72cfba28d92b04107c06e95e30e16732
  1. tests/