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

Change-Id: Ia7abc97fdcd81d2317c0ca2cfb3072735419d37f