updates from Andromadus vision repo (Flinny & Juansheng)

Change-Id: Ieea588ddf6120729816c9f9c7ea8ab142c72e8f8