[DO NOT MERGE] Don't accidentally delete renamed packages am: e2c85890ac am: 2a81b4c908 am: c893565d24
am: bc3d8e8673 -s ours
Change-Id: I9b6cff17aa4e62c17d25ebb747891a83a3e2c67a
This commit is contained in: