Merge tag r5

Change-Id: I197880584c1e924251542f14083211548a5394be