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

Change-Id: I74a7578e4d4cf57859962194cb80d7365fbd41d8