Merge "Throw IllegalArgumentException for takeScreenshot()" into rvc-dev am: ac337e7a am: 5645df06 Change-Id: I8b95fa2fb978fe0fde2eb1063164491afdd9d865