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

Change-Id: Ie5036dd9f7061dd01fc626bb18a5d61ba48c8c2d