[DO NOT MERGE] Don't accidentally delete renamed packages am: e2c85890ac am: 2a81b4c908
am: c893565d24

Change-Id: I3b0abcfcc23b114b38204c0c957acb1316698845