Merge \\"Docs: Changed Blank Activity to Basic Activity\\" into mnc-io-docs am: 93dd99c6aa
am: 92c664b13d

Change-Id: I52034f812994545893e6e4e8a9de9de79f593bb2