[automerger skipped] Merge "Adding version code R for development" am: b578bdbe43 am: 040206bfcc
am: 2629f2a5bf -s ours
am skip reason: change_id I26ef76266b2f52746ca08a45f5013c580cecd4fb with SHA1 1d081c503c is in history

Change-Id: I3841d579e2730c76477937bd6890445dd383993c