[automerger skipped] Merge "Add tests for onUpgrade logic" am: c2f2672cc3 am: 12603c0011
am: c531746e87  -s ours

Change-Id: Ib54443c59b367869a19776b6c8f17a2d9eb43d4d