Snap for 8005954 from eadf1f98a9c49674eddfeb3ab76f8adf9dfe334a to sdk-release

Change-Id: I62b28b089b21f4bb9b20e779c61cbe576cb825db