Fix bug 370640 - to allow in release upgrade.

Change-Id: I85209e693a0f1aff984e2896b779e3feb9c999e5
Merge "Fix bug 370640 - to allow in release upgrade." into R1.10