Merge "Remove changes to 001-HelloWorld"
am: b7f6807270

Change-Id: I090cfe1711fcd3441bc73dd32122f0081c10dcd3