Merge "docs: fixed typo in deprecation message" into pi-dev am: 0dabb070b8
am: 9a1acef1e7

Change-Id: I5926a7a19e08b540bf4a8a2db1cb86c2fbe2072f