Bug fixes now target latest release branch

Change-Id: Ie977d1d3c89d0721816df03c45d3ff5a5a75d144
Merge "Bug fixes now target latest release branch"