Images local

Change-Id: I58a34beccdb235731b7bce5ff4900f09cfaecfec
media debug:
Merge branch 'staging'