Snap for 11878282 from d3cdaa30d9aaa1dfb19563a91993afa82885eda1 to sdk-release

Change-Id: If0aa3bbba6e30c5445e1be7482599ff29552b9fe