Fixes README and shell

Change-Id: I2beec621fce4c8c8eb90631b2e543962f31687de
Closes-Bug: #1238183