Promote new diff to stable

Change-Id: I9784b0cc03be09a797721bb0d1528afa321d8f50
Merge "Promote new diff to stable"