Merge "Allow shared users to rotate signing certs in an OTA" into pi-dev am: c826eec11f
am: 52e9e9787d

Change-Id: If9d77ffe534d8b7af7c5d6c17ad9f84ee76fd5b3