Change for build JB

Change-Id: If50f5ca7672ec0142f10f16b2da83363557ad25d