Merge "Adding version code R for development" am: b578bdbe43
am: 040206bfcc

Change-Id: I108aed3a11875dd313e43c212526871e06ff9d33