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

Change-Id: I78bc56e63823ffe8de9b634002aa0f22fdaabfdd