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

Change-Id: If6495a817d87c41998cbc148fce7bbb39c4da5a4