This eases quick setup for demonstration purposes. Change-Id: I674c463989bc1529bfe132b7ec0df7a0052169df