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