Snap for 4693621 from e78d53a558b31aea56b9b70b068f5bf406018d6f to pi-release

Change-Id: I971e256837d082e82f6de795ceedb337b30e3a13