Snap for 8167433 from 80dfa914617c7e58fa13afc4b8af23063a6cba60 to sdk-release

Change-Id: Ia02caf1e061ee708585a72a32a0fe12a577dbe91