Merge "Remove screenshot_fd as optional param"
am: 9c8556e0f0

Change-Id: Ia780b04ec3495bc14fe1bef1348347ea53c1d864