Merge "Allow one-character package name"
am: 59eeba11fb

Change-Id: Iedddcd5cf130faaee9c6baf5990c3e791c9b5f59