Merge "Updates to Building for Devices page, b 20670305"