Merge "Add test for additional ClearKey UUID." into oc-mr1-dev am: 75c7efe507
am: 036a3ede95

Change-Id: I281a8a4f6e977e77e7cf0e45b1957edb62564fd5