Merge changes from topic "SoftHardStoragePerm" into qt-dev am: 7a9a83f6a1 am: 44604eeb93
am: d6056ba5fc

Change-Id: Id17abe0f965efd90780e50910cf810c819932921