pepper: path changes for JB

Change-Id: Ie289e3db61c2c22e83d541ce78ab3ecb529714e4
pepper: storage changes for JB

Change-Id: Id1bc0e631189f233fa947942fbbc038bdea35620