Merge "Remove "ro." prefix from sdk extension props" am: 57c17a8136 am: aae4da8fd3 am: e6303aaa3c

Change-Id: I665c25032124610e764915169d06a1ef9950d659