Follow our own Janice

Change-Id: I28c1ebb0995296acb108e215ef06ab9165a75ef6
Merge "Follow our own Janice" into kk44