Merge "Allow signing key rotation" into qt-qpr1-dev
am: 8c0b496c97

Change-Id: I94d38d4e27c789d2e0bb18e1a8253b06a78a57b1