Snap for 4677756 from 82e75ccd0dbf44b110c0ced77fc318678a8532a0 to pi-release

Change-Id: I6ab5a202c25df34dce45e20b45a22979b77d2612