Merge "No need to check package name am: ef8d8ea24a am: e0736b4fb0" into cw-f-dev am: e95b696ade
am: 88ea38b898

Change-Id: Iefc8b5447e901148fc3673e5bad27bf5a12a946a