Add janice patches

Change-Id: I1ed462f38a6aac3116025e7b6960f37d283b758f