Snap for 5798008 from 87cf89ca6aff0d2282af0c9d8e17340307d27bdd to sdk-release

Change-Id: I6f04020043c33610e60596597945a4e82b11788d