am 2fb449e9: am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 automerge: d6ed575

* commit '2fb449e9190abe7b3181d623091df378bc682a7b':