Merge branch 'master' into rvc-dev am: 529c45232d

Change-Id: I0096106c7acfb204cb4fba50e914d61091bdf713