Snap for 4535700 from 37d889123d8db17aabdd0dc5bca36fc2701c6287 to pi-release

Change-Id: I039611a47444d77e4e91a0ad15d3311fefcf3879