Merge "Add a setting to allow a user to choose the native image format" into...
Merge "Add a setting to allow a user to choose the native image format" into rvc-dev am: a1e1f069 am: d0f6aba8 am: ed0f4042
Change-Id: Iec0d8391b1b666ed140dce572e6fa2c4b6a8ed99