Merge \\"Allow calling in demo mode\\" into nyc-mr1-dev am: 8c8d752851
am: 1230bfc9c7

Change-Id: I87565cc57a39e85ec769ba325cfb7e1590c6b7f5