Snap for 6798053 from 73902364a12cdb856e8695597c7bf8305f07970b to studio-4.1-release

Change-Id: Id1d0a9529f99f4fd1e1e1629a22aa5f540b087ca