Snap for 4539464 from 61a139868eb14cc7d8bf65717b7be82aa09ad053 to studio-3.1-release

Change-Id: I0c6181ffdaa9f4465379cbdd8036a3ded9dfc470