Snap for 5289628 from fd144b327e9544e58c0af2e936407e12d852c666 to studio-3.4-release

Change-Id: I05ddfbbf338c2834abe4416a2d42d26b22b5ba0c