Snap for 8121614 from 6e26eee7222212e90299531d8892d9abfa84ca8a to sdk-release

Change-Id: I36d7f96ed3b1b7f5042c9c2b93607680eef4b6ad