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

Change-Id: I992e04521f93e709c6420c36ae424d37871ad2eb