Merge \\"Add setLandscape() method to ButtonInterface\\" into nyc-mr1-dev am: 3372c90cd7
am: 6de0295b30

Change-Id: I0621d0ddadb0f054e096c3dc2a941276be90e3b7