Snap for 6121801 from b2956c3ecee4b5f910a92c71aba1ae2cd142e4ac to studio-3.7-release

Change-Id: I8d0ee55c0d11575f5280da4a72c5f774a8d0384e