Snap for 4759746 from 4e6a483537d2f2f64e50a8d6fa4c67c46efc9076 to pi-release

Change-Id: I84f194a5b8aab3964b7a5cc68bdc5b641b1cb8d2