Snap for 6008936 from 7249d1f419055e88062e0527a091c234d6daf444 to r-keystone-qcom-release

Change-Id: Ib213679cfd7861011153e91e4ed2a6843f893d0b