Merge "Release 0.9.5 to live" into rvc-dev am: 1eec3c65b0

Change-Id: Ifa30b606ce61a90985f7e56ed907da117f3d97b4