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