fix upgrade from 4.2.2 to 4.3

Change-Id: I5cde87806ecd6f52ed10e50f9aea7cc23f78855d