Merge "Add tests for onUpgrade logic" am: c2f2672cc3
am: 12603c0011

Change-Id: I5787f389c5d7823af1b8bc6cccf137457e0069fd