Merge "Cherry-pick: Use getAssetUrl() to access files present in assets folder from master. DO NOT MERGE" into klp-dev