Snap for 4813226 from acfbc0eff45a8724817a90d81bd7173aeff732ff to pi-release

Change-Id: I9ced22149e80ae7a8fdd08ed0f0649cef5081be3