Snap for 9550355 from 7e4ef64394929e4a8eac40cf48e512439cc307de to sdk-release

Change-Id: I0ea6b080303cebb0f69f2a92ab712a6bfc939b07