API adjustments for Picture serialization discussion

Fixes: 124315734
Test: none
Change-Id: Ie1c610ae5536225f1ba454235be509f1c7e70bab
2 files changed