Snap for 11541002 from 54525f9d20b1e17266e216e54adab6f87ccf9702 to sdk-release

Change-Id: I284a5b4aef294d79e1d0106cbd92b3e63a2e6be8