Merge "Document -n option on intent specification." into pi-dev
am: 39f04a7da4

Change-Id: Id8b23acedbd9fe3eb73438b1397a6ff80d36c267