am b9588806: merge from open-source master

Merge commit 'b9588806a6b4fde223afb87575e603a9cb589b65'

* commit 'b9588806a6b4fde223afb87575e603a9cb589b65':
  Cleaned up LunarLander sample