Updated for janice

Change-Id: I30dd46a6854c3b7d08f3c4d224df62708ddc328b