Snap for 7961397 from 3df287557974dc807a1108a3136207188845674f to sdk-release Change-Id: I8d59f266594e6045d43f81524a3f294e31f30db7