Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs