Snap for 11987826 from de7a3a76cd3af0aad38f6b9c30b065769c5b0fdb to sdk-release

Change-Id: I6f0573a5989d0ac9cf542e66c51922088c5b4a71