Merge "Add tests for onUpgrade logic"
am: c2f2672cc3

Change-Id: I6a8dde9500ad8a58a8350ab9eeaf71610cc75a3f