update from replicant

Change-Id: Icbe5ee1f4159d4857381c024211d41f8d7f0a23e