Revert "props: s/rmt_storage/rmt_storage2/"

This reverts commit a9d8b8f0d156269a58cd0b3c5e866ff6ef621d1d.

Change-Id: I858d7b7de2e2d86d2466cf45999ce1d6667d40b2