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

Change-Id: I616edf5d0cb45fe06168e9c8b9ee68255b26887d