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

Change-Id: I5ca804673f85caf8c8fa1a2a9b8fdb3110ddb47f