Snapshot to 3fac2c96ae27d71378b421affda0caef6e5572c1

Change-Id: If9bbc74caa28a109824b054e5158586e1f7df950