Merge "No need to check package name" into nyc-mr1-dev am: 40db730b7f am: 875a96f5ac
am: 13b4a5cee2

Change-Id: Ie6a792f35baa6849ffb61ab3edb6e32fa3adbe5c