Snap for 7110675 from cfacb78776a1fa0d2f1fbb6f162ec3f738c358ba to sdk-release

Change-Id: I67c9efb0a3408e27c4cde76438271f5bce07952f