Snap for 13278158 from ea6f741e73dce964994c88f4c85a1be7ecbe44c0 to sdk-release Change-Id: Ib00ce32d785c7eee89206482f0fe386d206affc5