Merge "Remove "ro." prefix from sdk extension props" am: dc160ffbb2 am: b23348fbd4

Change-Id: I70b8bf6dfbaefc534aaad94b0a331d1a81203dd6