Merge "Allow signing key rotation" into qt-qpr1-dev am: ac269f35b4
am: bc9a87c4d5

Change-Id: Ie0bc9ebbfd6d7dc91c7620c2eea9982510622e22