Update release-1.5 and release-1.6

Change-Id: Id7fe1bf9dd2e94c7863c1a9f5a73287020dc8912
2 files changed