Merge "Minor nit in documentation." am: 3685a4d346
am: ebace397f9

Change-Id: I4be7c5ff80c245977c913fe8ce0469b1d14e2a11