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

Change-Id: I704d797eb4c3c0f2ffc449cb32681e68fcf7cc16