Merge changes from topic "SoftHardStoragePerm" into qt-dev am: 7a9a83f6a1
am: 3027477760

Change-Id: I134cf5d8ffa352e47b0dacfca4dd65ccd22d69ab