Snap for 8140651 from 2f2bd6684c45e82edceaac7f3f2e75055d2597d5 to sdk-release

Change-Id: I2a874db89caf9f92d652590b73587932da6f828a