Fix rambar

Change-Id: I3280fbc040af4bde29658e5a200230322571f6b5
Merge "Fix rambar" into jb4.3