[DO NOT MERGE] Don't accidentally delete renamed packages am: e2c85890 am: 2a81b4c9 am: c893565d am: bc3d8e86 -s ours Change-Id: I9b6cff17aa4e62c17d25ebb747891a83a3e2c67a