Non-critical fixes to releases metadata upgrade

Related-Bug: #1341505

Change-Id: I63ae5a9fc74635fe9e81a0a5ef1fd5b92af1b751
Merge "Non-critical fixes to releases metadata upgrade"