Merge "Remove Log import in Choreographer Test"
am: 95ca85d054

Change-Id: I4f1fee6f687d42ad3e653569aa7bc831b13a6fa5