Merge "docs: bug 37113731, correcting flag name" into pi-dev
am: 53b7ed70b5

Change-Id: Ib4d55f447b3727e6cb949cb832175686189d179c