Merge "Merge \\\"Docs: Changed Blank Activity to Basic Activity\\\" into mnc-io-docs am: 93dd99c6 am: 92c664b1 am: e9ec18cd" into nyc-mr1-dev