Cherry-pick from master e98f22d Change-Id: I165a7aeb429a4288d6f693a7613a4a102e21dd5b
e98f22d
Pkg.UserSrc=false
Pkg.Revision=4