RAMP-related updates

Change-Id: I1728a14d0d822fca85b912fa09d7bf437d65c1fa