updates to work with jb-mr1 builds...

Change-Id: Idfd669d1f6b610e60dd2d97dd17cfa0a125b41ff