nypon: path changes for JB

Change-Id: I5a9ee42116ea405baddfc22935a035c551ce074e
nypon: storage changes for JB

Change-Id: I546773e8bbe9dfa7e7c13d3b2e41edc7e9d953c6