Snap for 13198286 from 16ff738f4b4d8bfdffef4df4682230571caa67df to sdk-release Change-Id: I07775d203369c124ea09cf877c971df1a49ac1ef